Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Mon, 28 Nov 2011 08:14:38 +0000 (00:14 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Mon, 28 Nov 2011 08:14:38 +0000 (00:14 -0800)
commita9cec1eebe6db419257222fe43cdf36faf964cf6
treedfb9af5c3ffdb2072fcb8f892303e819b05ffdb4
parenta290b848a150931959f8c1cebeaa4d20f0bb1b86
parentdf5d67d4100bbeddf649b63ef395830cf1f8f71a
Merge from trunk.